On-demand treatment